Committing the Conflict Resolution

Question:

Start Quiz:

Solution:

INSTRUCTOR NOTE:

Near the beginning of the video, Caroline accidentally says "I still need to let Git know that the conflict is reserved." She meant "resolved", not "reserved".